From e069d3131e3e2c37e054bfbc746e7bacaae16987 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 9 Nov 2003 23:41:15 +0000 Subject: [PATCH] Remember the new value in all cases. (#126276, Damon Chaplin) Mon Nov 10 00:40:41 2003 Matthias Clasen * gtk/gtkeventbox.c (gtk_event_box_set_above_child): Remember the new value in all cases. (#126276, Damon Chaplin) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkeventbox.c | 5 ++--- 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98da860ed4..fe41dd56a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 10 00:40:41 2003 Matthias Clasen + + * gtk/gtkeventbox.c (gtk_event_box_set_above_child): + Remember the new value in all cases. (#126276, Damon Chaplin) + Sat Nov 8 23:06:02 2003 Matthias Clasen * demos/gtk-demo/main.c (row_activated_cb): Call the do_ diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 98da860ed4..fe41dd56a9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Nov 10 00:40:41 2003 Matthias Clasen + + * gtk/gtkeventbox.c (gtk_event_box_set_above_child): + Remember the new value in all cases. (#126276, Damon Chaplin) + Sat Nov 8 23:06:02 2003 Matthias Clasen * demos/gtk-demo/main.c (row_activated_cb): Call the do_ diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 98da860ed4..fe41dd56a9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Nov 10 00:40:41 2003 Matthias Clasen + + * gtk/gtkeventbox.c (gtk_event_box_set_above_child): + Remember the new value in all cases. (#126276, Damon Chaplin) + Sat Nov 8 23:06:02 2003 Matthias Clasen * demos/gtk-demo/main.c (row_activated_cb): Call the do_ diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 98da860ed4..fe41dd56a9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Nov 10 00:40:41 2003 Matthias Clasen + + * gtk/gtkeventbox.c (gtk_event_box_set_above_child): + Remember the new value in all cases. (#126276, Damon Chaplin) + Sat Nov 8 23:06:02 2003 Matthias Clasen * demos/gtk-demo/main.c (row_activated_cb): Call the do_ diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 98da860ed4..fe41dd56a9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Nov 10 00:40:41 2003 Matthias Clasen + + * gtk/gtkeventbox.c (gtk_event_box_set_above_child): + Remember the new value in all cases. (#126276, Damon Chaplin) + Sat Nov 8 23:06:02 2003 Matthias Clasen * demos/gtk-demo/main.c (row_activated_cb): Call the do_ diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c index 5bc7b754b0..6abdd1f72c 100644 --- a/gtk/gtkeventbox.c +++ b/gtk/gtkeventbox.c @@ -364,6 +364,8 @@ gtk_event_box_set_above_child (GtkEventBox *event_box, if (priv->above_child != above_child) { + priv->above_child = above_child; + if (GTK_WIDGET_REALIZED (widget)) { if (GTK_WIDGET_NO_WINDOW (widget)) @@ -381,7 +383,6 @@ gtk_event_box_set_above_child (GtkEventBox *event_box, gtk_widget_hide (widget); gtk_widget_unrealize (widget); - priv->above_child = above_child; gtk_widget_realize (widget); @@ -389,8 +390,6 @@ gtk_event_box_set_above_child (GtkEventBox *event_box, gtk_widget_show (widget); } } - else - priv->above_child = above_child; if (GTK_WIDGET_VISIBLE (widget)) gtk_widget_queue_resize (widget); -- 2.30.2